Autogenerated HTML docs for v2.29.2-154-g7f7eb
diff --git a/git-diff-index.txt b/git-diff-index.txt index f4bd815..27acb31 100644 --- a/git-diff-index.txt +++ b/git-diff-index.txt
@@ -9,7 +9,7 @@ SYNOPSIS -------- [verse] -'git diff-index' [-m] [--cached] [<common diff options>] <tree-ish> [<path>...] +'git diff-index' [-m] [--cached] [--merge-base] [<common diff options>] <tree-ish> [<path>...] DESCRIPTION ----------- @@ -27,7 +27,12 @@ The id of a tree object to diff against. --cached:: - do not consider the on-disk file at all + Do not consider the on-disk file at all. + +--merge-base:: + Instead of comparing <tree-ish> directly, use the merge base + between <tree-ish> and HEAD instead. <tree-ish> must be a + commit. -m:: By default, files recorded in the index but not checked